Skip to content

Add Shikra (QCM2390) display support for CQS and CQM targets#679

Open
naala-qcom wants to merge 4 commits into
qualcomm-linux:qcom-6.18.yfrom
naala-qcom:dt-changes
Open

Add Shikra (QCM2390) display support for CQS and CQM targets#679
naala-qcom wants to merge 4 commits into
qualcomm-linux:qcom-6.18.yfrom
naala-qcom:dt-changes

Conversation

@naala-qcom

@naala-qcom naala-qcom commented Jun 9, 2026

Copy link
Copy Markdown

@naala-qcom naala-qcom requested review from a team, Komal-Bajaj, aiquny and quic-kaushalk June 9, 2026 17:01
@qlijarvis

Copy link
Copy Markdown

PR #679 — validate-patch

PR: #679

Verdict Issues Detailed Report
⚠️ 0 Full report

Final Summary

  1. Lore link present:

    • Patch 01: No — vendor revert, no lore link expected
    • Patches 02-20: Yes — FROMLIST with lore.kernel.org links
    • Patches 21-28: No — new patches not yet posted upstream
  2. Lore link matches PR commits:

    • Patches 02-20: Cannot verify — lore links point to future dates (2026-06-04/05)
    • Other patches: N/A
  3. Upstream patch status:

    • Patches 02-20: Cannot determine — future-dated links
    • Patches 21-28: Not posted upstream yet (patches 23-24 have maintainer reviews suggesting they may be in review)
  4. PR present in qcom-next: Not checked — would require access to qcom-next branch

Recommendation: Before merging, remove all Change-Id tags from patches 2-14, fix the typo in patch 01, and add EOF newline to patch 22. The FROMLIST patches appear to be from an upcoming upstream submission series.

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #679 - Shikra Display Subsystem Support (28 patches)
Upstream commit: Multiple lore.kernel.org links (FROMLIST patches 2-20) + vendor patches (1, 21-28)
Verdict: ⚠️ PARTIAL

Summary by Patch Type

Patch 01: Vendor revert (no lore link expected)
Patches 02-20: FROMLIST patches with lore links
Patches 21-28: New patches without lore links (not yet posted upstream)


Commit Message Issues

Patch Issue Severity
01 Typo: "code chages" → "code changes" ⚠️ Minor
02-14 Change-Id tags present (Gerrit artifact) ❌ Must remove
02-20 FROMLIST patches - lore links point to future dates (2026-06-04/05) ⚠️ Cannot verify

Authorship & Tags

Check Status Note
Author preserved Imran Shaik, Nabige Aala, Arpit Saini
Signed-off-by present All patches have SOB
Reviewed-by tags Patches 23-24 have upstream reviews (Dmitry Baryshkov, Krzysztof Kozlowski, Loic Poulain)
Change-Id tags Present in patches 2-14 (must be removed before upstream submission)

Patch Categories

Category 1: Vendor Revert (Patch 01)

  • Subject: "clk: qcom: Revert older series Shikra GPUCC/DISPCC changes"
  • Status: ⚠️ Typo in commit body ("chages")
  • Lore link: N/A (vendor-only revert)

Category 2: FROMLIST Clock Patches (02-20)

  • All have Link: tags pointing to lore.kernel.org
  • Series IDs: 20260604-shikra-dispcc-gpucc-v4-* and 20260605-shikra-*
  • Status: ⚠️ Cannot verify (future dates), ❌ Change-Id tags must be removed
  • Patches cover: gcc-qcm2290, dispcc, gpucc, audiocorecc, DT bindings

Category 3: New Display Patches (21-28)

  • No lore links (not yet posted upstream)
  • Patches:
    • 21: dt-bindings: ILI7807S panel controller
    • 22: drm/panel: ILI7807S driver
    • 23: dt-bindings: Shikra MDSS (has Reviewed-by tags)
    • 24: soc: qcom: ubwc config (has Reviewed-by tag)
    • 25-28: arm64: dts additions and defconfig

Issues

Critical (Must Fix):

  1. Change-Id tags in patches 2-14 - These are Gerrit artifacts and must be removed before upstream submission. They are not acceptable in kernel patches.

Minor (Should Fix):
2. Typo in patch 01 - "code chages" should be "code changes"
3. Missing newline at EOF - Patch 22 (panel driver) ends without newline: MODULE_LICENSE("GPL");\ No newline at end of file

Cannot Verify:
4. FROMLIST patches reference future dates - Lore links point to 2026-06-04 and 2026-06-05, which don't exist yet. Cannot verify diff faithfulness or upstream acceptance status.

Diff Spot Checks

File Status Notes
drivers/clk/qcom/gcc-qcm2290.c ⚠️ Cannot verify against lore (future date)
drivers/gpu/drm/panel/panel-ilitek-ili7807s.c ⚠️ Missing EOF newline
arch/arm64/boot/dts/qcom/shikra.dtsi Looks reasonable for new SoC support
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts Board-specific display enablement

Verdict

Patches 02-14:MUST FIX - Remove Change-Id tags before merging. These are Gerrit artifacts not acceptable in upstream kernel patches.

Patch 01: ⚠️ SHOULD FIX - Fix typo "chages" → "changes"

Patch 22: ⚠️ SHOULD FIX - Add newline at end of file

Patches 21-28:ACCEPTABLE - New patches not yet posted upstream. Patches 23-24 already have upstream maintainer reviews.

Overall: The PR mixes vendor reverts, FROMLIST patches, and new patches. The FROMLIST patches contain Change-Id tags that must be removed. Cannot verify faithfulness to upstream due to future-dated lore links.

Final Summary

  1. Lore link present:

    • Patch 01: No — vendor revert, no lore link expected
    • Patches 02-20: Yes — FROMLIST with lore.kernel.org links
    • Patches 21-28: No — new patches not yet posted upstream
  2. Lore link matches PR commits:

    • Patches 02-20: Cannot verify — lore links point to future dates (2026-06-04/05)
    • Other patches: N/A
  3. Upstream patch status:

    • Patches 02-20: Cannot determine — future-dated links
    • Patches 21-28: Not posted upstream yet (patches 23-24 have maintainer reviews suggesting they may be in review)
  4. PR present in qcom-next: Not checked — would require access to qcom-next branch

Recommendation: Before merging, remove all Change-Id tags from patches 2-14, fix the typo in patch 01, and add EOF newline to patch 22. The FROMLIST patches appear to be from an upcoming upstream submission series.

@qlijarvis

Copy link
Copy Markdown

PR #679 — checker-log-analyzer

PR: #679
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/27222640163

Checker Result Summary
Checker Result Summary
checkpatch 13 commits with Gerrit Change-Id; 1 commit with indentation errors (60 lines)
dt-binding-check Passed
dtb-check DTS syntax error (missing label) + schema validation failures
sparse-check Passed
check-uapi-headers Passed
check-patch-compliance 9 commits missing required prefix; 2 commits differ from upstream Link
tag-check N/A Not applicable for this branch
qcom-next-check ⚠️ 20 FROMLIST commits present (expected for qcom-next)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #679 - Shikra GPUCC/DISPCC and Display Subsystem Support (28 commits)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/27222640163

Checker Result Summary
checkpatch 13 commits with Gerrit Change-Id; 1 commit with indentation errors (60 lines)
dt-binding-check Passed
dtb-check DTS syntax error (missing label) + schema validation failures
sparse-check Passed
check-uapi-headers Passed
check-patch-compliance 9 commits missing required prefix; 2 commits differ from upstream Link
tag-check N/A Not applicable for this branch
qcom-next-check ⚠️ 20 FROMLIST commits present (expected for qcom-next)

❌ checkpatch

Root cause: 13 commits contain Gerrit Change-Id: trailers that must be removed before upstream submission, and 1 commit has 60 lines with space indentation instead of tabs.

Failure details:

ERROR: Remove Gerrit Change-Id's before submitting upstream

Affected commits (13):
- 71ebdda8cca7 FROMLIST: clk: qcom: gcc-qcm2290: Keep the critical clocks always-on from probe
- cd0a8f02fa5d FROMLIST: dt-bindings: clock: qcom,qcm2290-dispcc: Add DSI1 PHY and sleep clocks
- 6e1782a40219 FROMLIST: dt-bindings: clock: qcom: Add Qualcomm Shikra Display clock controller
- 0f47b7f3b4f1 FROMLIST: dt-bindings: clock: qcom: Add Qualcomm Shikra GPU clock controller
- b473f6a29cff FROMLIST: clk: qcom: dispcc-qcm2290: Move to the latest common qcom_cc_probe() model
- 4ff200a789c3 FROMLIST: clk: qcom: dispcc-qcm2290: Switch to DT index based clk lookup
- 4ebc9d18b40e FROMLIST: clk: qcom: dispcc-qcm2290: Update GDSC *wait_val values and flags
- 85c0d8c5ee39 FROMLIST: clk: qcom: gpucc-qcm2290: Move to the latest common qcom_cc_probe() model
- ec6ae89ebd72 FROMLIST: clk: qcom: gpucc-qcm2290: Park RCG's clk source at XO during disable
- (4 more commits)

ERROR: code indent should use tabs where possible (60 occurrences)

Affected commit:
- 33051f09593b dt-bindings: display: msm: qcm2290: Add Shikra MDSS

Fix:

  1. Remove all Change-Id: lines from commit messages:

    git rebase -i HEAD~28
    # Mark affected commits for 'edit'
    # For each commit:
    git commit --amend
    # Delete the "Change-Id: I..." line from the commit message
    git rebase --continue
  2. Fix indentation in dt-bindings: display: msm: qcm2290: Add Shikra MDSS:

    git show 33051f09593b > /tmp/patch.diff
    # Identify the file with space indentation (likely a YAML binding)
    # Replace leading spaces with tabs in the affected sections
    # Amend the commit with corrected indentation

Reproduce locally:

git fetch origin pull/679/head:pr679
git checkout pr679
./scripts/checkpatch.pl --git HEAD~28..HEAD

❌ dtb-check

Root cause: DTS file arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:136 references undefined label usb_qmpphy_out, causing a fatal DTC syntax error. Additionally, multiple schema validation failures exist for panel and MDSS nodes.

Failure details:

Error: ../arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:136.1-16 Label or path usb_qmpphy_out not found
FATAL ERROR: Syntax error parsing input tree
make[4]: *** [../scripts/Makefile.dtbs:132: arch/arm64/boot/dts/qcom/shikra-cqs-evk.dtb] Error 1

Schema validation failures:
1. shikra-cqm-evk.dtb: display-subsystem@5e00000 (qcom,shikra-mdss): 
   iommus: [[31, 1056, 2]] is too short

2. shikra-cqm-evk.dtb: panel@0 (dlc,dlc0697):
   - 'bias-supply', 'enable-gpios', 'vddio-supply' do not match any of the regexes
   - compatible: ['dlc,dlc0697'] is too short (needs fallback compatible)
   - Missing required properties: 'vddi-supply', 'avdd-supply', 'avee-supply'

3. shikra-iqs-evk.dtb: display-subsystem@5e00000 (qcom,shikra-mdss):
   iommus: [[31, 1056, 2]] is too short

Fix:

  1. Fix missing label in shikra-cqs-evk.dts:136:

    • The label usb_qmpphy_out is referenced but not defined. Either:
      • Define the label in the USB QMP PHY node, OR
      • Remove/comment the reference if USB support is not yet ready for this board
  2. Fix panel binding in shikra-cqm-evk.dts:

    • Add fallback compatible: compatible = "dlc,dlc0697", "ilitek,ili7807s";
    • Rename supplies to match schema:
      • vddio-supplyvddi-supply
      • Add missing avdd-supply and avee-supply
    • Remove bias-supply and enable-gpios if not in schema, or update the binding YAML
  3. Fix MDSS iommus property:

    • The iommus property expects more than 3 elements. Check qcom,qcm2290-mdss.yaml schema for the correct format (likely needs additional IOMMU stream IDs)

Reproduce locally:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- CHECK_DTBS=y qcom/shikra-cqs-evk.dtb
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- CHECK_DTBS=y qcom/shikra-cqm-evk.dtb

❌ check-patch-compliance

Root cause: 9 commits lack the required subject prefix (UPSTREAM:, FROMLIST:, BACKPORT:, or FROMGIT:), and 2 FROMLIST commits have patch content that differs from the upstream lore.kernel.org link referenced in the commit message.

Failure details:

Commits missing required prefix (9):
1. clk: qcom: Revert older series Shikra GPUCC/DISPCC changes
2. dt-bindings: display: panel: add Ilitek ILI7807S panel controller
3. drm/panel: add Ilitek ILI7807S panel driver
4. dt-bindings: display: msm: qcm2290: Add Shikra MDSS
5. soc: qcom: ubwc: Add Shikra UBWC config
6. arm64: dts: qcom: shikra: Add MDSS display subsystem
7. arm64: dts: qcom: shikra-cqm-evk: Enable display and add ili7807s panel
8. arm64: defconfig: Enable ILI7807S DSI panel driver
9. arm64: dts: qcom: shikra-cqs-evk: Enable display

Commits with content mismatch (2):
- FROMLIST: dt-bindings: clock: qcom: Add the definition for the USB3 DP PHY reset
- FROMLIST: clk: qcom: gcc-shikra: Add USB3 DP PHY reset and LPASS clocks
  → "Change is different from the one mentioned in Link"

Fix:

  1. Add required prefix to 9 commits:

    • If these are Qualcomm-internal changes not intended for upstream: prefix with QCOM: or similar internal tag
    • If these are new patches being prepared for upstream: prefix with FROMLIST: and add a Link: tag to the lore.kernel.org posting
    • If reverting previous work: consider REVERT: or QCOM: prefix
  2. Fix content mismatch for 2 FROMLIST commits:

    • Option A: Update the Link: tag to point to the correct upstream version that matches the patch content
    • Option B: Revert local changes to match the upstream patch exactly, then apply local modifications as separate commits with appropriate prefixes

Reproduce locally:

# Check for required prefixes
git log --oneline HEAD~28..HEAD | grep -v -E "^[0-9a-f]+ (UPSTREAM|FROMLIST|BACKPORT|FROMGIT|QCOM):"

# Validate FROMLIST commits against lore links
# (requires check-patch-compliance script from kernel-config repo)

Verdict

11 blockers must be fixed before merge:

  1. Checkpatch (13 commits): Remove all Gerrit Change-Id: trailers
  2. Checkpatch (1 commit): Fix tab indentation in YAML binding
  3. dtb-check (critical): Fix undefined usb_qmpphy_out label in shikra-cqs-evk.dts
  4. dtb-check (schema): Fix panel compatible, supplies, and MDSS iommus properties
  5. check-patch-compliance (9 commits): Add required subject prefixes
  6. check-patch-compliance (2 commits): Resolve FROMLIST content mismatch with upstream links

Recommended workflow:

  1. Fix the critical DTS syntax error first (blocker for dtb-check)
  2. Remove Gerrit Change-IDs and fix indentation (automated fixes)
  3. Add missing subject prefixes (policy decision needed: QCOM: vs FROMLIST:)
  4. Resolve FROMLIST content mismatches
  5. Fix remaining schema validation issues
  6. Re-run CI to verify all checkers pass

@naala-qcom

Copy link
Copy Markdown
Author

qli-2.0 GA Critical Fix

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No Change Task Found

No associated change tasks found for CR 4566067 on any of the following entities:

Entities:

  • kernel.qli.2.0

CR: 4566067

Please ensure the CR has a change task associated with at least one of the entities for this branch.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No Change Task Found

No associated change tasks found for CR 4566067 on any of the following entities:

Entities:

  • kernel.qli.2.0

CR: 4566067

Please ensure the CR has a change task associated with at least one of the entities for this branch.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4566067 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4566067
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4566067 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4566067
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@sgaud-quic

Copy link
Copy Markdown
Contributor

@naala-qcom please rebase the PR on tip.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4566067 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4566067
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4566067 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4566067
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@shashim-quic shashim-quic left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • prefix all commits with valid tags (FROMLIST etc.)
  • include a valid Link: tag in commit log

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4566067 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4566067
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

Nabige Aala and others added 4 commits June 11, 2026 10:36
Add the SoC-level display subsystem nodes for Shikra: MDSS wrapper,
DPU display controller, DSI host controller, and 14nm DSI PHY.

Shikra uses DPU 6.5 hardware (same as QCM2290). Platform-specific
compatible strings are used as the primary match with QCM2290 fallbacks
to reuse the existing driver support.

The dispcc clock inputs for the DSI byte and pixel PLLs are wired
from mdss_dsi0_phy.

Signed-off-by: Nabige Aala <nabige.aala@oss.qualcomm.com>
…7807s panel

Enable the Shikra MDSS display subsystem on the CQM EVK
board and add the ili7807s panel node. Pin pm4125_l5 to
1.232V with regulator-allow-set-load for DSI PHY PLL
stability.

Signed-off-by: Nabige Aala <nabige.aala@oss.qualcomm.com>
Enable the ILI7807S 1080x1920 video-mode DSI panel driver as a module,
used on the Shikra CQM EVK board.

Signed-off-by: Nabige Aala <naala@qti.qualcomm.com>
Enable the DLC0697 MIPI DSI display panel on the Shikra
CQS EVK.

Signed-off-by: Nabige Aala <naala@qti.qualcomm.com>
@qcomlnxci qcomlnxci requested a review from a team June 11, 2026 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants